From: Kenichi Handa <handa@etlken>
Date: Thu, 8 Jul 2010 08:09:35 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~7006^2~17
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=2863bbcf9636c9451b6424d554468c2ec1515743;p=emacs.git

merge trunk
---

2863bbcf9636c9451b6424d554468c2ec1515743